Added more unit test methods, propreties and fields.