Expanding Interface use, adding test coverage