Reworked test cases. Now there is a seperate test method and no more
"one test to rule them all".