Better tests, fixed example json