Added unit tests that actually work