Added more tests

Review by @jspam please
{nit} please remove the hyphen between `return` and `statements` (also in the other tests)