Added more tests and minor refactoring:
swithch to haml from erb and minor refactoring