Fix tests for BS3 - all green now