convenience stuff.
fixed untracked files
modified testing codes so that i get results that i want!