Add more tests,.. mocking the universe