Final modifications to test