Fixed bugs and deployed tests