Forgot a couple methods and added test.