changed some tests fixed makefile
fixed merge conflicts
removed unnecissary conds and passive aggressive comments