Johanna - Test Stuff 4

Added Tests