Improved tests, changed exports to runnables