JBuilderTest re-do