Test Wrapping

wrap classes in tests, extract and clean