Extended testing
Added test cases for everything claimed to be covered so far.
Some tests do not succeed... :(