Tweaks, added knapsack test