Also amends tests plus additional clean ups Closes #1133 Change-Id: I0dad7b8aad9cff1b019323c7ac5a356830ab09ad