Web working, tests added