Improved the apperance of some tests to make it easier in the future