Removed the superfluous (at this moment) test case and fixed something that looked like a nasty bug.