Fixed tests. Fixed lint errors, and some warnings.