Test updates

Fixes #21 probably