Renamed
Renamed
Added more tests
Updated VS project file