Simple modifications for better use with functional tests