Added more tests

Review by @jspam please
{nit} you can leave out the `return`