Fixes + Test Class