Updates to cleanup testcases, this involves removing unused constructors, reworking the testcases to return use return and .then, and removing the this.async() calls.