Added javadoc
Re-enable + fix test for parameter parsing
Re-enable integration tests