Fix errors from small osgi refactor; comment out some test code