Added guard to assist in automated testing
Updated specs to provide more consistent results