extend logic with gravity treatment and adapt tests