reworking fixtures to include stages and refactoring