Remove Tests from manifest
Test Modifiers and compelete their implementation