Restructure
Skeleton test file