Added some test. WIP