Adding tests for complex classes