more moving username+password to a concern
fixing specs