More tests and work