Irdan/delete agent tokens

Making sure that tests cleanup after themselves and extending coverage of API.