More tests
Getting better, not there yet