Adding and updating tests