More tests, backend fixes