finished rewriting the tests, would appreciate if someone could try #5 with and without dynamic on