exceptions in modules + new tests