Added tests and some updates to work with new beta

Closes #10