Added further tests
Added M, D, C and L
Added special cases
Add limit of 5000