Added dash to key validation, updated unit test