Cleaning up prior test implementations and harmonizing implementation