Add more tests - still have to fix reset-instance