Fixed unit tests and commented out functions that weren't implemented or couldn't be validated with unit test
Will need to go back and validate if function needs to be used in future.