Additional tests and better naming of Inetfaces