Merge pull request #56 from smarthi/suneel

Fix the order of imports in PreferenceTest
Since size is known, use 2D array directly instead of List of array
Simplify a bit and disable DELETE until model handles it