Deferred tests

I took @celikmus's tests and cleaned them up and fixed the failing tests