Added simplecov and fixed some tests