Tests now all pass