Added more tests; dicked with protection levels