Support Moo, add tests