Add more testing types, enable output to console or HTML