Reworking spectral classes to make immutable
Continued to update unit tests