Testing cleanup as part of looking at permissions  

@cheddar could you have a look at this please. Started out as permissions but that happens in seagull now but wanted to keep the testing cleanup work 

cleanup of testing stuff
- use salinity and expect for testing fw
- remove fixtures that are no longer required