code conventions only
pointless assignment to variable
enabled some test cases again.
cleaned up a bit.