Moves test slots inline into the class

Also reorder to avoid forward declrations