Started Testing Phase Work

Edee pls fix