Changed test structure, added file extensions