more bug fixes from unit tests; level 1 looks good
1 file changed