Added even more WORKING testing code :D