Adding a few more tests.  Made parsed a singleton