Added Arrow Functions support
Tests update