Test clarity

Create a test directory and keep mains separate from each other.
Also Danny's new_tests.
This main needs the actual calls to the test functions.