Some more restructuring/renaming, rewrote writing SS Tests page to be more readable