Optimized performance of default values and added more test coverage. #20