Renamed files. Added a few more tests.