More minor bugfixes, a first test on examplemock, still not compiling