Add some testing

Should close #2