clean tests. wip convertion of templates from erb to haml