Renamed files for convenience
Renamed tests