Finalized mvp
Fixed tests