Fixed exceptions for test env