Litte bug fixes in tests.