Removed all the extra adding functions
Removed old test cases that won't work anymore.
Some words to be used.