Junit will need refactoring along with tested code, take test offline
until both are done.