Added new tests thanks to Michael Bradshaw