package cleanup and full context tests added