added several more tests; getting back to the lab