Components testing fix