Added in scenarios and testing