Tidied up teamcity tests
no longer accepting classmethods and staticmethods
neatened up a test