Fixing tests, still need some transactional tests that needs to be fixed