Unittest updates for attachpoints