Fix resettables

This PR fixes issues with resettables and adds tests. It also fixes issue breaking #22