Fixed remaining unit tests
Fixed types being overwritten