Merge "Adds unit test for Javelin"