Added a few Collection Tests fixed a few issues