More tests; more working