updated and rearranged tests.