Test runner working, cleanup needed