Fixes buffers not being added in the correct position, adds tests

5 jobs for master in 43 minutes and 11 seconds (queued for 19 seconds)
Status Job ID Name Coverage
  Build
passed #1631
build

00:18:12

 
  Test
passed #1635
test

00:23:31

failed #1632
test

00:23:52

 
  Deploy
passed #1634
deploy-beta

00:01:28

passed #1633
deploy-local

00:01:06