Improved exisisting tests and added a couple more for clarity