Tests now passing.