Fixing test functions