reworked listing and junk and got tests working