Added additional tests. Renamed tests.