Starting to add some tests + coverage