Turned on cleanup, added fixtures