Merge "More javelin unit tests"