Uniform styling
Add some dependency tests