refactored tests to isolate variant unit tests