Added more test to test unit