Fixed tests and code...

... so lets move on and start writing some more implementation now!