Introducing an interface and some more useless testing