few changes
tests