Updating make file and cuda tests