Implemented additional tests