Updating tests for bulk refactor