simplified interface + more tests