Progress in tests

As @killthekitten promised, I've made some tests passing :)