refactor
Test tidy up
Move to masked testing
Added slice tests