Added unit tests and refactored current solutions