removed test classes
added TaskFactory