Renamed file
Added some basic tests