Remaining tests added

Still could do some more scenarios though

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