Updated tests, 140/141 now pass