remove mode param and lock tests