Working through refactor for logic statements
Removed 'elementAt' methods
Porting existing v2 tests over to new libs