Fixed formatting, added test