extended test; renamed classes; removed unused methods