fixed stuff to pass test and added use of github.com/mohae/customjson.MarshalToString{}, makes troubleshooting complex structs easier. ShouldResemble could be switched to ShouldEqaul and probably should be