Fixing tests & Updated method signatures to use tags