fixed description parser and added more unit tests