Fixed failing code, reran tests - now passing.