added most of tests