Final Commmite W5

Unit tests working