prepared tests; removed some debug code