Added unit tests from previous solution. Adapted to run in tests directory