More Tests
Updte commonfunctions