Fixed bugs and added some test text