Cleanup and initial functional test