Fixing issues to get the tests working again