Added some tests and research