Revised tests to be compatible with new instantiated library