Cleaned up Security Service tests