Updated tests & methods