Fixes testing setup

In conjunction with #51, this should address testing concerns and allow you to continue with a nice testing setup.