Tests cleaning

- Removed should syntax and removed including test/unit