More tests, more fixes!