Added checks for keep state before join. Some tests are reworked.
Merge pull request #33 from DSRCompany/joining_tests_fix

Added checks for keep state before join. Some tests are reworked.
Merge remote-tracking branch 'salt/master'