Sample tests are now a feature brag
Moved stuff around. Removed useless tests