added support for moontest