forgotten to stone the bitch ;)
fixed unittests