Split up factories and controllers, add factory tests