Add: working code for first test