F/improved testing standards

Improved Test coverage and fixes CodeSniff issues.