Some modifications
Finalize tests