replaced test items with the real ones, small style fixes