Uncommented some tests and they pass (tweaked save test to return valid adapter output)