add unit test for stack, and change order of includes for unit test running.