small modifications..new tests