CS fixes, minor code changes
Fixes wrong validation
Drops in codeception
Fixes genius rebase