Bugfixes/reduce aca0006 diagnostics (#23)

* test rewrites for diagnostic changes

* fix done

* dead code removal

Author: taori