Added initial common objects
Added tests