Moved spec files around. Added more tests