Some style fixes and a new test!