Updated interface and added test.