Adding more testing, fixing typos to make higher coverage (removing
unnecessary try-catches, bit of refactoring)