remove broken test, replace with sensible one, fix some poor names
extra test for objective B