Toan, Nikesh & Chloe || Updated tests and added migrations