Removed usage of given-when, which is unfortunately considered experimental