Added beginning of some tests