- Add Asserts

- Clean Files unnecessary