More tests to satisfy
Implemented some low hanging fruit to satisfy a handful of tests