Added read only user logic and finished fixes for scp test phase