adds more tests to spec, renames methods so that they follow rules