Updated tests for not only case classes