Updating tests; cleanup