Adding Unit Tests and Class comments.