tid -> timer
Made a combineArrays helper
combineArrays -> combineObjs
Fixed a bug in combineObjs
Added tests for combineObjs
Re-organized tests