minor fixes, added mock expects