Fix states entrance
Change states behaviour
Fix states callbacks
Fix all tests