Changed a few method names as well.
Moved core test code to reflect changes in core code. Removed unused using directives.