Fixing test, preparing for release