What's different between their tank setup and their tub setup? The closer you can keep it to their original setup, the better. Also, are they irritable just when you open the tub or are they showing other signs such as restlessness?