finalize sol3 + add tests sol3