Add back moment tests

And fix a mistake :-)
Linting / cleaning
Add some tests
Remove moment-related tests

Since they are in their own file now
Fix tests