First attempt at adding tests, needs work