organized test project a little.
saving some minor changes.