Added test for correct simplex classification

Also rearranged includes to make cpplint happy and
set output values so that running unittests gives better
feedback on tests with small runs