Tests fix

Addresses #30.