Refactor lap tests