include dependencies for testing & rename server
merge conflicts