Fixes broken Java 7 tests
Fixes broken component tests
Consistent component report for Java (converges with native components)