Categorize the remaining tests needed
Move old tests out of the way