More work towards passing test