Added tests, now 100% covered