update profiles and tests
code cleanup