Adding back in scubbed tests