Updates some tests based on modified functionality.
Merge branch 'feature/initial_customizations_20130418'