updated tests; all passing again