Renamed to correct file name. Adding more unit tests.