Rename to instack
Fix other unit tests