Unit tests + more design changes + function level optimizations.

Unit tests + more design changes + function level optimizations. #227