Restructure my sample test
Simplify my sample data, add trivial tests