Clean up and updating tests