Small change exfor the entire project and added tests