Fixed failing tests

'Fixed'