Updated styling and fixed tests