Added 2 new tests, as well as refactored the code a little bit
Refactored tests to be a little better and more obvious