More Unit Test. Fixed genarme error