moved test files
Updated test case content
Added number support