Reworked tests to be instance based.