Update tests to include motion. Coverage higher.