DIY: Prepare for meaningful tests
Commented out the default ones for now, fleshed out the fixtures a bit.