Removed return type.
Cleaned up test cases.