minor change
fixed bug that was preventing free-cell from compiling
renamed varibles in tests that collided with underscore to make tests pass