Cleaned up pull request after white box testing.