Beginning adding some tests