Handle more complex classes. Fix coveralls in development