Change to use ClassLoader aware ClassWriter
Add back tests with BaseTest