Remodeling the tests