Adding Helper tests and making it pretty