Fixed a few methods so tests will run and ready for methods to be implemented.