Work on new @UnitTest class