Uncommenting unit tests, pass after fixing quote form