Fixed some tests
Added user resource
Fixed conflict