Cleanup tests and convert leftover JSON methods