Fixes for controls tests and JS Profiles tests