WIP started to rewrite the unit tests