Added more tests

Forgot to comit this yesterday.