INT: Code cleanup of test