Moar tests updated (and passing)