Readded test, not working but..