[SQUASH ME] changed naming and added some specific tests