Fix quicktests, clean up source files a bit.