Add some tests and fix simplecov coverage