Fix bugs in unit tests. Push pointer forward. First unit test passes.