[#65555890] added more specs & fixed issue with non-hash annotations