Few more changes based on feedback of 'User' and 'Test' API in continuation to prev commit