Implementing factory_boy + added some tests