Added tests
Test implementation