Many test fixes on the way to make them work :)