2022-04-04

Simplify tests, fix issues and implementation errors; Validate all tests