Tests now with 100% coverage!