lint and testing additions