Refactoring: Fixed a test, and Adding header