Cleaned and improved tests, added base var