Improvement/tests

Refs #32, #33