updated tests; removed some cruft from main