updated headers for helper methods and started updating tests