Fixed when library for monthly (hack) and fixed two bugs in uni tests