Improved collection tests, removed unfinished attopic tests from suite