Test fixes/improvements

Signed-off-by: Naomi Novik <shalott@gmail.com>
Fixing a couple small bugs and permissions issues

Signed-off-by: Naomi Novik <shalott@gmail.com>