cleaning up tests
reformatting