Fix incorrect assertions
Added test
Added another test
Added another TM test