corrected some issues; now 21 tests successful