Added find and remove test methods.