Fix tests review

Fixes some == => === issues and some internal build tool issues