Fixed tests

Still need tests for the generic back button stuff though