Made neccesary changes to start work on unit tests