+ Add autowire annotation
+ More tests