Adjusted the values for the (hopefully) final test.
Also the class has been refactored to simplify the setting of values for
each test. Now it's only needed to modify a method (depending on the
test).