Improved the tests' readibility a bit