Fix tests and allow for backwards compatibility for JSON loading