refactor code
[#21] try to make the acceptance test pass, now fail two lines after, still not use always valid authentication