clenup / improve test / migrate to square robolectric plugin / fix param string stuff