Refactored tests

Tests are passing now

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