Fix bugs in unit tests. Push pointer forward.