Update test path structure and context for instance vs class methods
more tests and bug fixes