Added more unit tests and removed Yeoman markup