Moving test file to more closely match recommended structure