Added in some basic tests