Updated Unit Tests and Applied Formatting