Updated to include defaults that cannot be overwritten

- Also added tests