+ added some tests