junk removed / minor tests correction