cleaned up property names and wrote more literate tests -- closes #26