start cleaning out depricated (non S4) functions
new S4-based tests
separate class files by type
tidying up