[TASK] Restructure fixtures - closes #28