few fixes and checks before first assert tests (1)
few fixes and checks before first assert tests (1)

thomas-pendragon/dablang,thomas-pendragon/dablang,thomas-pendragon/dablang,thomas-pendragon/dablang