adds further refinements to the architecture and login test features