Adding NEW tests and src