Changing ERB structure to Haml and added validations test