Unit Tests

- Refactored, now cleaner.