Accidentally had wrong tests in wrong files.. Corrected.