Added testing sets. Minor fixes.