remodel and extend tests