Start adding/fixing tests