added more features test & additional debugging utilities