[FIX] Added test and error fix