remove debug; add tests to suite