Added more tests

Review by @jspam please
Not sure if we need this import ... haven't tried removing it though ;)