Trying to add tests and json