More tests, mostly working