exceptions and test changes