Move most test text to files, cover more code with all tests