Implemented new base testing functionality. Added output in markup format.