Feature/tests contd