Merge branch 'develop' into local_plots
Initial creation of ColorAxis test and associated helper
Merge branch 'fb_plots' into local_plots
Add color axis tests