Needs test cases for new methods.