Renamed tests file.
Fixed remaining tests.