Unit Tests

- Removed unnecessary code.  Thanks Renato.