Ship movement test improvements