Changed Vector, added a few unit tests