remodelled the asserts