Remove unnecessary @SupressWarnings and formatting.
More tests. Coverage over 50% now.