Removed two tests until solar@ fix