issue #20: part 2 (manual and isolation tests are complete)