fixed the unit tests

- still not happy with the layout yet