Fixed indention
Modified testing behaviour
Moved some integers to constants and cleaned up