Fixes for handling auth tests