Fix tests for new system minus a couple