Adding javadoc BAU-222
Some cleanup, and turning unit tests back on, dev-BAU-222