adapted tests, exception catching