Added each method, test clean up