added some tests
fixed haml