Fixed tests

Refs #3