adding tests; removed unused helper and pending tests