More dev and add some tests