Added headers for testing, refactored with request properties