adding delay test and general clean up