Fixed 2 testing failures