tests remodeled