fix codestyle and add some specs after merge