Fixes to implement initial individual unit tests
Fixes to implement initial full-page unit tests