BS-10261, change one integration test
BS-10195, add factory and javadoc
fix compilation issues