Cleaned up tests and db guesser implementation