Merge "Adding simple, missing junit"