General cleanup. Put test classes in idiomatic places and remove
pointless and distracting interfaces which aren't actually used.