Methods, exceptions, tests improved