Added tests and updated checker