Add more moon stuff + test file