Add system.properties
Remove some dependencies
test
Update test