Clean up test, add lots of tests to new (as .org files)