fixing #7; spacing style; uncommenting tests