Refactor and finish expenses testing