Minor changes and updating tests