Change salary to defaultSalary, fix tests