Classtests

Resolves issue #24