Fixed issue where integers where not recognized when there was a space infront.
Added rest of Tokentypes and part of the corresponding tests