Add new methods, tests and test files