Add dependencies
Make config test pass
Code comments