Add some tests to increase coverage, and fix some small bugs found along the process. Coverage is now above 80% \o/