Added some more interfaces and updated test