Updated some solutions + unit tests