Added to tests, cleaned up structure, added less.