switched to carrierwave and added some tests