Make test suite pass and bend to standards