Created first tests and compleated the code to forfill them