Add new EnginioModel tests and fix two trivial bugs.