Tweaked the test macro and added more implementations of it.