added test/fixed interfaces