adding tests and 3.3.x preperation
changes to support the tests too