Base version for tests

- Commented every improvement made