Fixtures creating tidied up