Improve tests

Closes #18