Move customized test files out of library and tweak naming