Tmp commit with some bugfixes, and test with multiple db's as master