Refactored to make use of Async Testing Macros

Signed-off-by: Ippoippo <ippoippo-software@ippoippo-eco.com>