Cleaned up text class, more tests too