Cleaning up binaries
Extract TestFramework out to its own project
Adding Java compatibility hacks