Fixing tests to take into account more options