Tests fixed (commons-lang3 dependency).  Rearranged for eventual testing lido07.