Actual needed results

Some methods added. Tests are now directed towards the actual values we
need.