Updated + pruned tests for default arguments. 21/21 pass