Updating headers and doing some minor refactoring of tests