Correction to unit tests and added new test and pocos