Improved functionality after unit tests