moved functionality out of tests to their right sphers