More Unit tests

..and more unit tests which fail