Added Test functionality