changes due to new Moo version, better tests
0.263