Updated changes to motorcycle unit tests