Recreat code with yo
Make tests runable