Added some tests and dev updates