Switch back to building junit test structure before switch to bootstrapped classes so we can pick the right SDK in the future.