[Do not merge yet] - Finalizing Unit-Tests