fixed various tests...
see TODO for next