Added a couple tests, still needs alot of work