Add gtest and redo solutiuon disk layout