added remove test. reduced wait time