another TODO item done
small bug in the test suite