Merge pull request #460 from bhariharan/hybrid_fast_user

Test fixes