Added test file, updated bins with optimizations