Merge "add unit tests for Moon"