Add better unit testing, remove regression tests