Start adding some tests