Added some tests skeleton
New approach using custody