Adding some basic testing in; more to come.