Enhance unit tests. Push pointer forward.