Add unit tests, upgraded to newest version of spark and scala