chg: dev: fixes for testing, formatting