Changed test API for reducing naming issues and making it more human readable.
Updated test suite to new API