More tests and validation techniques

I might circle back for a better commit message