@filipw this needs to be refactored using the test style we agreed on.