Update tests; cleanup