Updated list with estimates
Added some tests for visibility.