Adding budget module, and some tests