Added more tests

Review by @jspam please