Working on the tests and code conventions