Renaming unit tests for clarity's sake.
Removing obsolete macro file.