Load samples once
Simplify
New models and tests
Simplify a bit more and fix up repo locations
Change names