updated tests, reworked [:id]