Fixed tests

@tarebyte