Adding in some tests