Test fixes. Closes #105
Clean up