Added missing dollar signs
Added loan_type to LoanCalculationType so each company loan can use different tables and fixed import to make it more flexible.
Updated test data sets