Mainly updated tests section