Fix test type checking
Merge branch 'master' into feature/angular
This is mainly for the psr updated stuff