Rearranged some of TestState and began adding to the level