Cleanup and make tests runnable