temp commit
pre memory testing commit
merge fixtures