merge fix
add moon and astroid filed unit test...all passing
merge