Refactor Tests And Components