Few cleanups for OpenLine's tests