Added test for #307 that passes
Updated test for #307 and still passes
Test for #308 which passes