Tests added and tested(coupled tests not included)