DO NOT MERGE investigating issues with testing rollback behavior