added simplecov and minor fixes"