Minor changes and unit testing setup