Improved tests a bit; fixed some project stuff