Undid some IntelliJ nastiness (class under test directory by mistake) and added tests and implementation.