Removing vim swap files, adding some unit tests