Make tests better
adds tests for http header property expansion and makes it work for rest also