Updated tests as requested in the comments