Added some checkers

* Also improved some testings
* Fixed headers