+ new tests
# some optimizations

Signed-off-by: Deepro <said.dk@gmail.com>