Code working, unit tests written