Updated the tests with some more variants for testing