Feature/expand tests