Added more tests & did some file moving.