Added unit tests!