test: Overal clean up and improvement of test cases

Clean up the test cases (simplifying more-or-less arbitrary
values to consistent values).