Deleted old testing file. Minor bugfixes.