Fixed Captable screen; Added test;