Made junit tests working again, moved all speedtest to seperate project,
to be fixed in a later stage...