Fix unit tests

(hopefully) fixes #38

Moves integration tests into the integration tests

@chetan51 @rhyolight