Add some tests for POJO
Rename test classes