Updates to fade implementation and test file as layout has changed slightly