fixed test, modified code slightly, Text class almost done