Switched to list. Added Test and started TestBuilder