Added tests and staticdata