configuration added, server tests added
merge conflicts solved