Added some tests and changelist items