Added new test for activation-key
Fixed the tests as per the comments
Merge pull request #964 from tkolhar/master

Added new test for activation-key