Fix errors, increase coverage, profit
Add more tests, increase coverage again
1.4.1