Structured and formatted the default test package