Fixing some tests and better sturcture.
Clean console.logs