Added testing for all but render