Added tests; interface updates