Additional tests and renaming
Start of validation integration and filters
Valiation tests added - all tests passing