attempt at adding/fixing tests