Added more tests

Review by @jspam please
Please remove this comment.